widget: Check for containerness before calling container API
authorTimm Bäder <mail@baedert.org>
Fri, 18 Nov 2016 08:53:58 +0000 (09:53 +0100)
committerTimm Bäder <mail@baedert.org>
Sat, 7 Jan 2017 15:44:01 +0000 (16:44 +0100)
gtk/gtkwidget.c

index 82dadbec2be9c37b7cbf37d3fb886afd989ff185..e481a729bd2259fd6100d0a9754663e881edb650 100644 (file)
@@ -4011,8 +4011,11 @@ gtk_widget_unparent (GtkWidget *widget)
   if (_gtk_widget_is_toplevel (toplevel))
     _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
 
-  if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget)
-    gtk_container_set_focus_child (GTK_CONTAINER (priv->parent), NULL);
+  if (GTK_IS_CONTAINER (priv->parent))
+    {
+      if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget)
+        gtk_container_set_focus_child (GTK_CONTAINER (priv->parent), NULL);
+    }
 
   if (_gtk_widget_is_drawable (priv->parent))
     gtk_widget_queue_draw_area (priv->parent,